Added a snapshot. Renamed previous ebuild and marked it stable.

7 files changed, 66 insertions, 48 deletions

diff --git a/app-i18n/iiimsf/ChangeLog b/app-i18n/iiimsf/ChangeLog
index c63119a8dbeb..272f9ba897bb 100644
--- a/app-i18n/iiimsf/ChangeLog
+++ b/app-i18n/iiimsf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/iiimsf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/ChangeLog,v 1.4 2004/06/24 21:45:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/ChangeLog,v 1.5 2004/09/13 19:57:25 usata Exp $
+
+*iiimsf-12.0.1_pre1891 (14 Sep 2004)
+*iiimsf-11.4_p1467 (14 Sep 2003)
+
+  14 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/iiimsf-11.4.1467-gentoo.diff, -iiimsf-11.4.1467.ebuild,
+  +iiimsf-11.4_p1467.ebuild, +iiimsf-12.0.1_pre1891.ebuild:
+  Added a snapshot. Renamed previous ebuild and marked it stable.
 
 *iiimsf-11.4.1467 (14 Sep 2003)
 
diff --git a/app-i18n/iiimsf/Manifest b/app-i18n/iiimsf/Manifest
index 06df84cab312..b74a9a611981 100644
--- a/app-i18n/iiimsf/Manifest
+++ b/app-i18n/iiimsf/Manifest
@@ -1,7 +1,10 @@
-MD5 f7f14c3c9cd058b7ef30073922d18609 iiimsf-11.4.1467.ebuild 640
 MD5 aea482b1de889de95c8f16ebbbd548b4 ChangeLog 663
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 8ef5bcb6a09776cb876c122447df119c iiimsf-11.4_p1467.ebuild 839
+MD5 c4a5554628006140842dbb7e038950fa iiimsf-12.0.1_pre1891.ebuild 994
 MD5 172cd4695ba49417dc9c6c62d10400b8 files/iiimsf-11.4.1467-gentoo.diff 2283
 MD5 6e7144823c257fd7ec97768e6cb835ef files/htt.conf 4765
 MD5 5db19d1b3aa08ebd6259e5ef6a882b1d files/digest-iiimsf-11.4.1467 71
 MD5 4da5512a7540aec500349265848f41c6 files/iiim.initd 443
+MD5 e97031d3645096ad0e4fb680a228b9c0 files/digest-iiimsf-12.0.1_pre1891 77
+MD5 5db19d1b3aa08ebd6259e5ef6a882b1d files/digest-iiimsf-11.4_p1467 71
diff --git a/app-i18n/iiimsf/files/digest-iiimsf-11.4.1467 b/app-i18n/iiimsf/files/digest-iiimsf-11.4_p1467
index f4949c9aee07..f4949c9aee07 100644
--- a/app-i18n/iiimsf/files/digest-iiimsf-11.4.1467
+++ b/app-i18n/iiimsf/files/digest-iiimsf-11.4_p1467
diff --git a/app-i18n/iiimsf/files/digest-iiimsf-12.0.1_pre1891 b/app-i18n/iiimsf/files/digest-iiimsf-12.0.1_pre1891
new file mode 100644
index 000000000000..80df98ccfb77
--- /dev/null
+++ b/app-i18n/iiimsf/files/digest-iiimsf-12.0.1_pre1891
@@ -0,0 +1 @@
+MD5 4e51e4fd07391bd957622db0e89aeefe im-sdk-src-r12_0_1-svn1891.tgz 18206118
diff --git a/app-i18n/iiimsf/files/iiimsf-11.4.1467-gentoo.diff b/app-i18n/iiimsf/files/iiimsf-11.4.1467-gentoo.diff
deleted file mode 100644
index 838e3ffdae22..000000000000
--- a/app-i18n/iiimsf/files/iiimsf-11.4.1467-gentoo.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -urN im-sdk-r11_4-1467.ORIG/iiimsf/src/Makefile.am im-sdk-r11_4-1467/iiimsf/src/Makefile.am
---- im-sdk-r11_4-1467.ORIG/iiimsf/src/Makefile.am	2003-08-23 16:31:38.000000000 +0900
-+++ im-sdk-r11_4-1467/iiimsf/src/Makefile.am	2003-09-09 19:45:12.000000000 +0900
-@@ -27,5 +27,5 @@
- 
- htt_SOURCES = watchdog.c
- 
--htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS)
-+htt_server_LDADD = $(LIB_DIR)/iml/libiml.la /usr/lib/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS)
- bin_PROGRAMS = htt_server htt
-diff -urN im-sdk-r11_4-1467.ORIG/iiimsf/src/Makefile.in im-sdk-r11_4-1467/iiimsf/src/Makefile.in
---- im-sdk-r11_4-1467.ORIG/iiimsf/src/Makefile.in	2003-08-23 16:46:25.000000000 +0900
-+++ im-sdk-r11_4-1467/iiimsf/src/Makefile.in	2003-09-09 19:44:22.000000000 +0900
-@@ -154,7 +154,7 @@
- 
- htt_SOURCES = watchdog.c
- 
--htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS)
-+htt_server_LDADD = $(LIB_DIR)/iml/libiml.la /usr/lib/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS)
- bin_PROGRAMS = htt_server htt
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/../acfiles/mkinstalldirs
-@@ -181,7 +181,7 @@
- 	IIIMPUtil.$(OBJEXT) IIIMPTrans.$(OBJEXT)
- htt_server_OBJECTS = $(am_htt_server_OBJECTS)
- htt_server_DEPENDENCIES = $(LIB_DIR)/iml/libiml.la \
--	$(IM_LIBDIR)/iiimp/libiiimp.la
-+	/usr/lib/libiiimp.la
- htt_server_LDFLAGS =
- 
- DEFS = @DEFS@
-diff -urN im-sdk-r11_4-1467.ORIG/iiimsf/src/IMSvrCfg.cpp im-sdk-r11_4-1467/iiimsf/src/IMSvrCfg.cpp
---- im-sdk-r11_4-1467.ORIG/iiimsf/src/IMSvrCfg.cpp	2003-08-23 16:46:25.000000000 +0900
-+++ im-sdk-r11_4-1467/iiimsf/src/IMSvrCfg.cpp	2003-09-09 19:44:22.000000000 +0900
-@@ -22,7 +22,7 @@
- #ifdef WIN32
-     initstr(CONFIGFILE, "Configuration file", "D:\\WINNT\\System32\\htt.conf");
- #else
--    initstr(CONFIGFILE, "Configuration file", "/usr/lib/im/htt.conf");
-+    initstr(CONFIGFILE, "Configuration file", "/etc/im/htt.conf");
- #endif
-     initstr(CONVERSIONKEYS, "Conversion ON keys", "<Ctrl>space");
-     initstr(LABEL, "Label type", "numeric");
diff --git a/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild b/app-i18n/iiimsf/iiimsf-11.4_p1467.ebuild
index 78724259cdb0..cd4662b022ca 100644
--- a/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild
+++ b/app-i18n/iiimsf/iiimsf-11.4_p1467.ebuild
@@ -1,19 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/iiimsf-11.4.1467.ebuild,v 1.6 2004/06/24 21:45:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/iiimsf-11.4_p1467.ebuild,v 1.1 2004/09/13 19:57:25 usata Exp $
 
 inherit iiimf eutils
 
 DESCRIPTION="server program to provide Input Method facilities via IIIMP"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="dev-libs/libiiimp"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	cd ${S}/src
+	sed -i -e 's,$(IM_LIBDIR)/iiimp,/usr/lib,g' Makefile* \
+		|| die "sed Makefile.{am,in} failed."
+	sed -i -e 's,/usr/lib/im/htt.conf,/etc/im/htt.conf,g' IMSvrCfg.cpp \
+		|| die "sed IMSvrCfg.cpp failed."
 }
 
 src_install() {
diff --git a/app-i18n/iiimsf/iiimsf-12.0.1_pre1891.ebuild b/app-i18n/iiimsf/iiimsf-12.0.1_pre1891.ebuild
new file mode 100644
index 000000000000..6c7efd570d55
--- /dev/null
+++ b/app-i18n/iiimsf/iiimsf-12.0.1_pre1891.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/iiimsf/iiimsf-12.0.1_pre1891.ebuild,v 1.1 2004/09/13 19:57:25 usata Exp $
+
+inherit iiimf flag-o-matic
+
+DESCRIPTION="server program to provide Input Method facilities via IIIMP"
+
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libiiimp"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	sed -i -e 's,$(IM_LIBDIR)/iiimp,/usr/lib,g' Makefile* \
+		|| die "sed Makefile.{am,in} failed."
+	sed -i -e 's,/usr/lib/im/htt.conf,/etc/im/htt.conf,g' IMSvrCfg.cpp \
+		|| die "sed IMSvrCfg.cpp failed."
+}
+
+src_compile() {
+	export ALLOWED_FLAGS="-O -O1"
+	strip-flags
+	replace-flags -O[2-9] -O
+	iiimf_src_compile
+}
+
+src_install() {
+	exeinto /usr/lib/im
+	doexe src/htt src/htt_server
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/iiim.initd iiim
+	insinto /etc/im
+	doins ${FILESDIR}/htt.conf
+
+	dodoc ChangeLog htt.conf
+}