From c7ef4878f852d2d41143890cce02b1eb8669f895 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Sat, 3 Apr 2010 03:10:52 +0000 Subject: [PATCH] Fixed to work with >=uim-1.5. the patch is from http://gist.github.com/333944. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- app-i18n/scim-uim/ChangeLog | 11 ++++++-- app-i18n/scim-uim/Manifest | 25 +++++++++++++++++-- .../files/scim-uim-0.2.0-uim-1.5.patch | 12 +++++++++ ...-0.2.0.ebuild => scim-uim-0.2.0-r2.ebuild} | 24 ++++++++++-------- 4 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch rename app-i18n/scim-uim/{scim-uim-0.2.0.ebuild => scim-uim-0.2.0-r2.ebuild} (67%) diff --git a/app-i18n/scim-uim/ChangeLog b/app-i18n/scim-uim/ChangeLog index fc9395e4bd24..b07b8d1b3ac4 100644 --- a/app-i18n/scim-uim/ChangeLog +++ b/app-i18n/scim-uim/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-i18n/scim-uim -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.32 2009/06/01 16:20:12 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/ChangeLog,v 1.33 2010/04/03 03:10:52 matsuu Exp $ + +*scim-uim-0.2.0-r2 (03 Apr 2010) + + 03 Apr 2010; MATSUU Takuto -scim-uim-0.2.0.ebuild, + +scim-uim-0.2.0-r2.ebuild, +files/scim-uim-0.2.0-uim-1.5.patch: + Fixed to work with >=uim-1.5. the patch is from + http://gist.github.com/333944. 01 Jun 2009; nixnut scim-uim-0.2.0-r1.ebuild: ppc stable #268943 diff --git a/app-i18n/scim-uim/Manifest b/app-i18n/scim-uim/Manifest index d3c7a067dbb6..61aaf3d80fab 100644 --- a/app-i18n/scim-uim/Manifest +++ b/app-i18n/scim-uim/Manifest @@ -1,6 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX scim-uim-0.2.0-gcc43.patch 420 RMD160 2668820bf92cfab516b6e77bdbcc7577ad2970c8 SHA1 fb192dee696e0d19a55816fb34c180d61a01ffa7 SHA256 f969543e949dd81ae09b0e567fb0c3a3b9090216b8f792ef013a5e9b10bc69d8 +AUX scim-uim-0.2.0-uim-1.5.patch 367 RMD160 b636c91b72dac710ff5ec641cbedfa77acbf4fd1 SHA1 5890e808115e64900ffc3e98870ba79da942985e SHA256 d221fb2a08474de0d38b28d03e833cb4f1613e8d3959b7c308d9fb7a30cc09b4 DIST scim-uim-0.2.0.tar.gz 344389 RMD160 4cb0261742e4d67317535da1a01de7fa803139ca SHA1 456621d5969b6552c3c33c83cf295aa4134fff0a SHA256 457eb89f40dda70f813c0b401aaec8b397e7daa340d53136aba3b97407533e13 EBUILD scim-uim-0.2.0-r1.ebuild 1057 RMD160 c99125b543e15b31487a044c9fc4308432bad16d SHA1 f86bfa653cda343afe12c55b09b9d5713f30cab8 SHA256 451836aa56dbe4841124958f4809e1ff85f9270c4ee138f23c43ed3f955de757 -EBUILD scim-uim-0.2.0.ebuild 995 RMD160 e09a700dd6960ea74f932e9c4f3f820da4d1412e SHA1 564746642d4229bb1729dee5cf54c73cd4aa8b84 SHA256 24a5afb69e66664ddcf1f02415e5442b5b84951ec7a9153ac0d163745d8f6499 -MISC ChangeLog 4571 RMD160 a38e0c48e12300f2ceb0080861bd1eb2fe2ff6cb SHA1 744ce94c2cb59241dfc50a94b914c606f738e26e SHA256 b82085dacafed28a2ba359f2f108c8a62171715a2bf3606c9d1a2ef8ee1bedf3 +EBUILD scim-uim-0.2.0-r2.ebuild 1072 RMD160 99a305db2d31b2a94600ff567e098800f9dab7ac SHA1 5fe7decb17af4c7dad6e0d5be4002a886b8191ad SHA256 37d37eff404dc52fd48f330b6c11e07be734d79dd4dab89d47a0592bb22a34e6 +MISC ChangeLog 4828 RMD160 4df73997c981ab1ae455dc89ded9d48755f7033a SHA1 ceccbca911b0dd0b8fa9a1b33f58b1c5c7d24663 SHA256 03f68b4e6609cd44f6746ef7455b5a8f6c925991124b8b442efc857970597ebb MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAEBAgAGBQJLtrHkAAoJECaGw+YFKA1pqvAP/3fIOi08SWzxS5IGnLmseCrY +w/yfd/hU6ORhZD8HKyF0Xjmre8GWFq57SSD7BV8UAy1a2mEXGzFoq+2gIeRPThNS +nZEPdjNyT+IM0kW5zNXugusFQod9ahFYbUDbDAkO4GcEeSGJIHJxv1+/5q3b/v3K +AXLVSvedpwF+2f1wJ80BeV2vGc/YZ3ZR4UJpkqL+Q2ujllMvOq/Di9aiJYlrzeA+ +TamCb7eOiIYoEziMBLP/3YQgQ47WCK2a8FQa7n9SxIawQ700s1yYJMizJ6gVpaAy +qV5vyqdxVoSNkMbCU0gWZh8LHa03e4fdCx/MmcK7JaO5KRTmQrUwT/atq9R48ZSQ +DWvzmi8rTx8P5WgW1DkP71iReig/9MkXopmuuwHIFF/08c9vqVS4f2KwsVB84dV5 +iLFycHOSvof7avbfPdTQBXbrB4hpQiYXq7ef7F+NDIvPKcRHDuPWn/mi29/mP4BZ +3IXvbWf46mob0ffumP3cGJcDomT54q6pJ2gf7WRjT1mX5oB4YyjfsEcedM3pDI0a +EiiM2vBDBmLK2PZpQwslZVODFzIiRSOLPq1BGi/18lB6cIYa5oSBu+vLbmosbPYr +1JdowEctn+wb9M2kqdlHxtQDCxho04xHTJIoOoabV8uEFw/CASjUAUjqsZEBmdkc +TG/CduD+ByPlK4DYp0OB +=9EbR +-----END PGP SIGNATURE----- diff --git a/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch b/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch new file mode 100644 index 000000000000..d186b441bb8d --- /dev/null +++ b/app-i18n/scim-uim/files/scim-uim-0.2.0-uim-1.5.patch @@ -0,0 +1,12 @@ +--- scim-uim-0.2.0/src/scim_uim_imengine.cpp ++++ scim-uim-0.2.0/src/scim_uim_imengine.cpp +@@ -35,7 +35,8 @@ + #include + #include + #include "scim_uim_imengine.h" +-#include ++#include ++#include + + #define scim_module_init uim_LTX_scim_module_init + #define scim_module_exit uim_LTX_scim_module_exit \ No newline at end of file diff --git a/app-i18n/scim-uim/scim-uim-0.2.0.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild similarity index 67% rename from app-i18n/scim-uim/scim-uim-0.2.0.ebuild rename to app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild index baecf3b54abc..cc7b9f217079 100644 --- a/app-i18n/scim-uim/scim-uim-0.2.0.ebuild +++ b/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild @@ -1,6 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.2.0.ebuild,v 1.5 2008/06/10 16:59:12 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild,v 1.1 2010/04/03 03:10:52 matsuu Exp $ + +EAPI="2" +inherit eutils DESCRIPTION="scim-uim is an input module for Smart Common Input Method (SCIM) which uses uim as backend" HOMEPAGE="http://www.scim-im.org/" @@ -8,22 +11,23 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ppc x86" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="" -RDEPEND=">=app-i18n/uim-1.1.0 - =app-i18n/scim-1.4.0 - >=app-i18n/scim-cvs-1.4.0 - )" +RDEPEND=">=app-i18n/uim-1.5.0 + >=app-i18n/scim-1.4.0" DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}/${P}-gcc43.patch" \ + "${FILESDIR}/${P}-uim-1.5.patch" +} + src_install() { emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog README THANKS + dodoc AUTHORS ChangeLog README THANKS || die } pkg_postinst() { -- 2.26.2