Fixed #107436.
authorMatsuu Takuto <matsuu@gentoo.org>
Sun, 2 Oct 2005 05:12:24 +0000 (05:12 +0000)
committerMatsuu Takuto <matsuu@gentoo.org>
Sun, 2 Oct 2005 05:12:24 +0000 (05:12 +0000)
Package-Manager: portage-2.0.51.22-r2

app-i18n/xsim/ChangeLog
app-i18n/xsim/Manifest
app-i18n/xsim/files/digest-xsim-0.3.9.4-r3 [new file with mode: 0644]
app-i18n/xsim/files/xsim-0.3.9.4-gcc-3.4.patch [new file with mode: 0644]
app-i18n/xsim/xsim-0.3.9.4-r3.ebuild [new file with mode: 0644]

index 3d72b8a56e6257584f77dca5ad82e303d4842db5..d27d195ce407820236029616c52b72f485fa18be 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/xsim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.11 2005/02/10 21:14:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.12 2005/10/02 05:12:24 matsuu Exp $
+
+*xsim-0.3.9.4-r3 (02 Oct 2005)
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/xsim-0.3.9.4-gcc-3.4.patch, +xsim-0.3.9.4-r3.ebuild:
+  Fixed compile problem on gcc-3.4. The patch is from debian.
 
   10 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -xsim-0.3.9.4-r1.ebuild, -xsim-0.3.9.4.ebuild:
index 3a7f3d3ab01ed05a630af034f7a311d1be29ab44..3309846b0cb074963f75027a2f436b0c2bcbf42e 100644 (file)
@@ -1,6 +1,9 @@
-MD5 7bdfdd7aad81a2be29d9c9e56e1feafd ChangeLog 1304
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 f6ac9c19b5d3912b0b8dc977ed27b169 xsim-0.3.9.4-r2.ebuild 1750
+MD5 3a1fd3faadae321aec1cffa3cb3e1ba1 xsim-0.3.9.4-r3.ebuild 1816
+MD5 ac6fce55d575e62bf2f7065924821b19 ChangeLog 1507
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 b09020ab653fd5cd1b693e3def773f0b files/digest-xsim-0.3.9.4-r2 65
+MD5 b09020ab653fd5cd1b693e3def773f0b files/digest-xsim-0.3.9.4-r3 65
 MD5 922ec332bf51c73ead1e3082d62d23c8 files/xsim-0.3.9.4-db3.patch 934
 MD5 f2699816a48c16ad587b27e48ccf4d8a files/xsim-0.3.9.4-compile-fix.patch 2563
+MD5 3cde284e90d244eefffd8b54c2486f3b files/xsim-0.3.9.4-gcc-3.4.patch 3163
diff --git a/app-i18n/xsim/files/digest-xsim-0.3.9.4-r3 b/app-i18n/xsim/files/digest-xsim-0.3.9.4-r3
new file mode 100644 (file)
index 0000000..828534b
--- /dev/null
@@ -0,0 +1 @@
+MD5 645d68ee8c565c04782068c4546504d9 xsim-0.3.9.4.tar.gz 1025640
diff --git a/app-i18n/xsim/files/xsim-0.3.9.4-gcc-3.4.patch b/app-i18n/xsim/files/xsim-0.3.9.4-gcc-3.4.patch
new file mode 100644 (file)
index 0000000..a51af48
--- /dev/null
@@ -0,0 +1,111 @@
+diff -urN ../tmp-orig/xsim-0.3.9.4/plugins/IMs/jianpin/dict/char2db.cpp ./plugins/IMs/jianpin/dict/char2db.cpp
+--- ../tmp-orig/xsim-0.3.9.4/plugins/IMs/jianpin/dict/char2db.cpp      2002-09-23 06:22:39.000000000 +0200
++++ ./plugins/IMs/jianpin/dict/char2db.cpp     2004-08-07 16:18:49.654735809 +0200
+@@ -74,11 +74,7 @@
+ {
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       f.open(filename, ios_base::in);
+-#else
+-      f.open(filename, "r");
+-#endif
+       istream in(&f);
+ 
+       char cbuf[10];
+@@ -154,11 +150,7 @@
+ 
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       f.open(argv[1], ios_base::in);
+-#else
+-      f.open(argv[1], "r");
+-#endif
+       istream in(&f);
+ 
+       char mark;
+diff -urN ../tmp-orig/xsim-0.3.9.4/plugins/IMs/jianpin/dict/word2db.cpp ./plugins/IMs/jianpin/dict/word2db.cpp
+--- ../tmp-orig/xsim-0.3.9.4/plugins/IMs/jianpin/dict/word2db.cpp      2002-09-23 06:24:17.000000000 +0200
++++ ./plugins/IMs/jianpin/dict/word2db.cpp     2004-08-07 16:19:16.271589168 +0200
+@@ -83,11 +83,7 @@
+ 
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       f.open(argv[1], ios_base::in);
+-#else
+-      f.open(argv[1], "r");
+-#endif
+       istream in(&f);
+ 
+       char mark;
+diff -urN ../tmp-orig/xsim-0.3.9.4/plugins/IMs/table/dict/word2db.cpp ./plugins/IMs/table/dict/word2db.cpp
+--- ../tmp-orig/xsim-0.3.9.4/plugins/IMs/table/dict/word2db.cpp        2002-09-23 06:34:06.000000000 +0200
++++ ./plugins/IMs/table/dict/word2db.cpp       2004-08-07 16:23:56.841264376 +0200
+@@ -90,11 +90,7 @@
+ 
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       f.open(argv[1], ios_base::in);
+-#else
+-      f.open(argv[1], "r");
+-#endif
+       istream in(&f);
+ 
+       char mark;
+diff -urN ../tmp-orig/xsim-0.3.9.4/plugins/IMs/wubi/dict/word2db.cpp ./plugins/IMs/wubi/dict/word2db.cpp
+--- ../tmp-orig/xsim-0.3.9.4/plugins/IMs/wubi/dict/word2db.cpp 2002-09-23 06:28:45.000000000 +0200
++++ ./plugins/IMs/wubi/dict/word2db.cpp        2004-08-07 16:23:35.738361690 +0200
+@@ -81,11 +81,7 @@
+ 
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       f.open(argv[1], ios_base::in);
+-#else
+-      f.open(argv[1], "r");
+-#endif
+       istream in(&f);
+ 
+       char mark;
+diff -urN ../tmp-orig/xsim-0.3.9.4/xsim/conf.cpp ./xsim/conf.cpp
+--- ../tmp-orig/xsim-0.3.9.4/xsim/conf.cpp     2002-09-17 09:53:37.000000000 +0200
++++ ./xsim/conf.cpp    2004-08-07 16:22:35.792001180 +0200
+@@ -133,11 +133,7 @@
+         filebuf f;
+ 
+       char dummy[MAX_PATH_LEN + 1];
+-#ifdef _CPP_BITS_IOSBASE_H
+       if (!f.open(config_path.tombs(dummy, MAX_PATH_LEN), ios_base::in)){
+-#else
+-      if (!f.open(config_path.tombs(dummy, MAX_PATH_LEN), "r")){
+-#endif
+               cerr << "XSIM: failed opening config file" << endl;
+               return 1;
+               }
+@@ -340,11 +336,7 @@
+ 
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       if (f.open(path.tombs(dummy, MAX_PATH_LEN), ios_base::out)){
+-#else
+-      if (f.open(path.tombs(dummy, MAX_PATH_LEN), "w")){
+-#endif
+               ostream out(&f);
+               for (size_t i = 0; i < name.size(); i++){
+                       out << name[i].tombs(dummy, MAX_PATH_LEN) << '\t';
+@@ -372,11 +364,7 @@
+ 
+         filebuf f;
+ 
+-#ifdef _CPP_BITS_IOSBASE_H
+       if (f.open(path.tombs(dummy, MAX_PATH_LEN), ios_base::in)){
+-#else
+-      if (f.open(path.tombs(dummy, MAX_PATH_LEN), "r")){
+-#endif
+               istream in(&f);
+               char n[MAX_PATH_LEN + 1];
+               char v[MAX_PATH_LEN + 1];
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r3.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r3.ebuild
new file mode 100644 (file)
index 0000000..0a2d430
--- /dev/null
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r3.ebuild,v 1.1 2005/10/02 05:12:24 matsuu Exp $
+
+inherit kde-functions eutils
+
+DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
+HOMEPAGE="http://developer.berlios.de/projects/xsim/"
+SRC_URI="http://download.berlios.de/xsim/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde"
+
+DEPEND="virtual/libc
+       >=sys-libs/db-3
+       >=sys-apps/sed-4
+       kde? ( >=kde-base/kdelibs-3 )"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/${P}-compile-fix.patch
+       epatch ${FILESDIR}/${P}-gcc-3.4.patch
+
+       einfo "Patching ./configure to respect CFLAGS .."
+       sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS} -fPIC -DPIC/" configure || die
+}
+
+src_compile() {
+       local myconf
+
+       if use kde; then
+               set-qtdir 3
+               set-kdedir 3
+               myconf="${myconf}
+                       --with-kde3=${KDEDIR} \
+                       --with-qt3=${QTDIR} \
+                       --enable-status-kde3"
+       fi
+
+       econf ${myconf} || die "configure failed"
+       emake xsim_etcp=/etc || die "make failed"
+}
+
+src_install() {
+       einstall xsim_datp=${D}/usr/lib/xsim/dat \
+                       xsim_libp=${D}/usr/lib/xsim/plugins \
+                       xsim_binp=${D}/usr/bin \
+                       xsim_etcp=${D}/etc \
+                       install-data install || die "install failed"
+
+       sed -i -e "s#DICT_LOCAL\(.*\)/usr/dat#DICT_LOCAL\1/usr/lib/xsim/dat#" \
+               -e "s#PLUGIN_LOCAL\(.*\)/usr/plugins#PLUGIN_LOCAL\1/usr/lib/xsim/plugins#" \
+               ${D}/etc/xsimrc
+
+       dodoc ChangeLog COPYING INSTALL README* TODO
+}
+
+pkg_postinst() {
+       einfo "XSIM needs write access to /usr/lib/xsim/dat/chardb, so if you"
+       einfo "not running it as root, you need to do the following:"
+       echo
+       einfo "  cp -r /usr/lib/xsim/dat \${HOME}/.xsim"
+       einfo "  sed -i \"s#DICT_LOCAL.*#DICT_LOCAL \${HOME}/.xsim#\" > \${HOME}/.xsim/xsimrc"
+       echo
+}