Added beta release.

(Portage version: 2.0.51.22-r1)

7 files changed, 31 insertions, 121 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 740692f29d61..5f47763eb9f4 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.98 2005/06/18 16:15:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.99 2005/06/20 04:36:27 usata Exp $
+
+*uim-0.4.7_beta1 (20 Jun 2005)
+
+  20 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> -uim-0.4.6.ebuild,
+  -uim-0.4.6-r1.ebuild, +uim-0.4.7_beta1.ebuild:
+  Added beta release.
 
   18 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> +files/uim-0.4.6-nls.diff,
   uim-0.4.6-r2.ebuild:
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index a470f0869366..8aff85c4afd2 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -5,6 +5,7 @@ MD5 9ae8c34bd7e46587513962d2fbc49e5b uim-0.4.6.ebuild 2859
 MD5 221153655e1fe7bac2daef5d116032a0 uim-0.4.6-r2.ebuild 3520
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
 MD5 e736fcc88b38fe12c061fc18c436d8e2 uim-0.4.6-r1.ebuild 3316
+MD5 4c67d50c808aa88d8eeae8896dce8f0a uim-0.4.7_beta1.ebuild 3182
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 2e727a4087d5b9811a6d153a375faa2f files/digest-uim-0.4.6 139
 MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
@@ -12,5 +13,6 @@ MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
 MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r1 192
 MD5 cc10c5d38fe1cce5a6e17fad95da53d7 files/uim-0.4.6-gtk2_4-gentoo.diff 441
 MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
+MD5 457b374b1271701f1b29274d2d4551c7 files/digest-uim-0.4.7_beta1 132
 MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
 MD5 faf7d637e9266fbc6613cdf8ee56e427 files/uim-0.4.6-nls.diff 404
diff --git a/app-i18n/uim/files/digest-uim-0.4.6 b/app-i18n/uim/files/digest-uim-0.4.6
deleted file mode 100644
index 3f14101f3fb3..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz 1467039
-MD5 f33cc2061ff56c5c2728f2bac7269908 prime-0.9.4-beta2_uim-0.4.6_2.scm 74081
diff --git a/app-i18n/uim/files/digest-uim-0.4.6-r1 b/app-i18n/uim/files/digest-uim-0.4.6-r1
deleted file mode 100644
index 508954e86b6c..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz 1467039
-MD5 ade5e6e9805e1aff24b51372526c04d3 skk-dic-serv.diff2.bin 2168
-MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/files/digest-uim-0.4.7_beta1 b/app-i18n/uim/files/digest-uim-0.4.7_beta1
new file mode 100644
index 000000000000..9a0129c5671c
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.7_beta1
@@ -0,0 +1,2 @@
+MD5 5aa631c68c205abc4fadba3c3aa83f43 uim-0.4.7beta1.tar.gz 1545443
+MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/uim-0.4.6.ebuild b/app-i18n/uim/uim-0.4.6.ebuild
deleted file mode 100644
index 30f960f2ebd9..000000000000
--- a/app-i18n/uim/uim-0.4.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6.ebuild,v 1.1 2005/02/27 02:41:58 usata Exp $
-
-inherit eutils kde-functions
-
-PRIME_P=prime-0.9.4-beta2
-PRIME_SCM=${PRIME_P}_${P/_*/}_2.scm
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz
-	http://prime.sourceforge.jp/src/${PRIME_SCM}"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep
-	canna? ( app-i18n/canna )
-	immqt? ( >=x11-libs/qt-3.3.3-r1 )
-	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )
-	qt? ( >=x11-libs/qt-3.3.3-r1
-		!app-i18n/uim-kdehelper )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp ${DISTDIR}/${PRIME_SCM} scm/prime.scm || die
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --enable-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -I${S}/qt"
-	fi
-	use qt && set-qtdir 3
-
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		$(use_with gtk gtk2) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_with canna) \
-		$(use_with qt) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge app-i18n/prime"
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.4.6-r1.ebuild b/app-i18n/uim/uim-0.4.7_beta1.ebuild
index d002718d2998..2d75958f61ff 100644
--- a/app-i18n/uim/uim-0.4.6-r1.ebuild
+++ b/app-i18n/uim/uim-0.4.7_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6-r1.ebuild,v 1.4 2005/05/30 19:31:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7_beta1.ebuild,v 1.1 2005/06/20 04:36:27 usata Exp $
 
 inherit eutils kde-functions
 
@@ -10,13 +10,13 @@ S="${WORKDIR}/${MY_P}"
 DESCRIPTION="a simple, secure and flexible input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
 SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz
-	http://lists.sourceforge.jp/mailman/archives/anthy-dev/attachments/20050313/47aab99c/skk-dic-serv.diff2.bin
 	http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
+#IUSE="${IUSE} scim"
 
 RDEPEND="X? ( virtual/x11 )
 	gtk? ( >=x11-libs/gtk+-2 )
@@ -33,6 +33,9 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
 	>=sys-apps/sed-4
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
 # An arch specific config directory is used on multilib systems
@@ -41,7 +44,6 @@ GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
 
 src_unpack() {
 	unpack ${A}
-	cp "${DISTDIR}"/skk-dic-serv.diff2.bin "${WORKDIR}"/skk-dic-serv.diff2.gz
 
 	cd "${S}"
 	# we execute gtk-query-immodules-2.0 in pkg_postinst()
@@ -49,25 +51,29 @@ src_unpack() {
 	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
 		Makefile.am || die
 	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-	cd uim; epatch "${WORKDIR}"/skk-dic-serv.diff2.gz
 }
 
 src_compile() {
 	local myconf
 	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --enable-qt-immodule"
+		myconf="${myconf} --with-qt-immodule"
 		export CPPFLAGS="${CPPFLAGS} -I${S}/qt"
 	fi
 	use qt && set-qtdir 3
 
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		$(use_with gtk gtk2) \
-		$(use_with m17n-lib m17nlib) \
-		$(use_with canna) \
-		$(use_with qt) \
-		${myconf} || die "econf failed"
+	myconf="${myconf}
+		$(use_enable nls)
+		$(use_with X x)
+		$(use_with gtk gtk2)
+		$(use_with m17n-lib m17nlib)
+		$(use_with canna)
+		$(use_with qt)"
+
+	autoreconf
+	libtoolize --copy --force
+
+	# --with-scim is not stable enough
+	econf ${myconf} --without-scim || die "econf failed"
 	emake -j1 || die "emake failed"
 
 	cd ${WORKDIR}/prime-1.0.0.1