change the repository location and merged the changes of app-i18n/uim.

(Portage version: 2.0.51.21-r1)

9 files changed, 162 insertions, 157 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index 9c01cfd55524..e8bab5f71085 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.15 2005/01/29 13:10:49 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.16 2005/05/05 15:00:02 hattya Exp $
+
+*uim-svn-20050505 (05 May 2005)
+
+  05 May 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/uim-svn-configure-fix.diff,
+  -files/uim-svn-gtk-query-immodules-gentoo.diff,
+  -files/uim-svn-qtkde-helper.diff, -uim-svn-20040709.ebuild,
+  +uim-svn-20050505.ebuild:
+  change the repository location and merged the changes of app-i18n/uim.
 
   29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> uim-svn-20040709.ebuild:
   Proper usage of kde eclasses, to make sure KDEDIR is defined (#33079).
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 40585487582b..b348a78b1aa8 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,6 +1,5 @@
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 49a3e01682f6ade6e0b6feb43a0c6403 ChangeLog 2021
-MD5 05478f3c204b3694a560934bb323bc44 uim-svn-20040709.ebuild 2238
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uim-svn-20040709 0
-MD5 6ac55183c0f2b2572c9679103d91d8c9 files/uim-svn-qtkde-helper.diff 744
-MD5 43709db248e2be1d40952ce99d3cae00 files/uim-svn-gtk-query-immodules-gentoo.diff 552
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 efce43dfddca038842ec87ffce64f190 uim-svn-20050505.ebuild 2726
+MD5 224fb1ad2d4fafabab78a7aee65c0c9f files/digest-uim-svn-20050505 65
+MD5 a62d7626d662b5071bfe32c9bc28e513 files/uim-svn-configure-fix.diff 496
diff --git a/app-i18n/uim-svn/files/digest-uim-svn-20040709 b/app-i18n/uim-svn/files/digest-uim-svn-20040709
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-i18n/uim-svn/files/digest-uim-svn-20040709
+++ /dev/null
diff --git a/app-i18n/uim-svn/files/digest-uim-svn-20050505 b/app-i18n/uim-svn/files/digest-uim-svn-20050505
new file mode 100644
index 000000000000..58faa152ef88
--- /dev/null
+++ b/app-i18n/uim-svn/files/digest-uim-svn-20050505
@@ -0,0 +1 @@
+MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim-svn/files/uim-svn-configure-fix.diff b/app-i18n/uim-svn/files/uim-svn-configure-fix.diff
new file mode 100644
index 000000000000..722b7e4c9a07
--- /dev/null
+++ b/app-i18n/uim-svn/files/uim-svn-configure-fix.diff
@@ -0,0 +1,12 @@
+diff -urN uim.orig/configure.ac uim/configure.ac
+--- uim.orig/configure.ac	2005-03-16 14:20:53.000000000 +0900
++++ uim/configure.ac	2005-04-24 09:39:47.129795192 +0900
+@@ -232,7 +232,7 @@
+       ;;
+       yes|*)
+         PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
+-        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2.4="yes",use_gtk2.4="no")
++        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2_4="no")
+       ;;
+     esac
+   ],
diff --git a/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff b/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff
deleted file mode 100644
index 99df5672eab1..000000000000
--- a/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN uim-0.3.3.ORIG/gtk/Makefile.am uim-0.3.3/gtk/Makefile.am
---- uim-0.3.3.ORIG/gtk/Makefile.am	2004-03-20 05:29:48.000000000 +0900
-+++ uim-0.3.3/gtk/Makefile.am	2004-03-22 03:08:58.709699312 +0900
-@@ -19,16 +19,12 @@
- IM_UIM_SOURCES = gtk-im-uim.c
- 
- install-data-hook:
--	if test -f $(GTK_IMMODULES); then \
--	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
--	fi
-+
- uninstall-hook:
--	if test -f $(GTK_IMMODULES); then \
--	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
--	fi
-+
- else
- install-data-hook:
- 
-- uninstall-hook:
-+uninstall-hook:
- 
- endif
diff --git a/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff b/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
deleted file mode 100644
index 33205d98e732..000000000000
--- a/app-i18n/uim-svn/files/uim-svn-qtkde-helper.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- uim.orig/qt/uim-kdehelper/configure.in.in	2004-06-20 00:17:30.000000000 +0900
-+++ uim/qt/uim-kdehelper/configure.in.in	2004-06-20 22:47:14.625513536 +0900
-@@ -4,17 +4,5 @@
- AC_C_BIGENDIAN
- AC_CHECK_KDEMAXPATHLEN
- 
--AC_CHECK_LIB(uim, uim_init, HAVE_UIM_LIB=yes, HAVE_UIM_LIB=no)
--if test "x$HAVE_UIM_LIB" = "xyes"; then
--  AC_CHECK_HEADER(uim/uim.h, HAVE_UIM_LIB=yes, HAVE_UIM_LIB=no)
--  if test "x$HAVE_UIM_LIB" = "xyes"; then
--    AC_DEFINE(HAVE_UIM_LIB, 1,
--       [Define to 1 if you have uim library and header files])
--    LIB_UIM="-luim"
--  else
--    AC_MSG_ERROR([You are missing uim headers.])
--  fi
--else
--  AC_MSG_ERROR([You are missing uim. Please install uim first.])
--fi
-+LIB_UIM="../../../../uim/libuim.la"
- AC_SUBST(LIB_UIM)
diff --git a/app-i18n/uim-svn/uim-svn-20040709.ebuild b/app-i18n/uim-svn/uim-svn-20040709.ebuild
deleted file mode 100644
index 1ae7ffb24a6c..000000000000
--- a/app-i18n/uim-svn/uim-svn-20040709.ebuild
+++ /dev/null
@@ -1,107 +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-svn/uim-svn-20040709.ebuild,v 1.8 2005/01/29 13:10:49 greg_g Exp $
-
-inherit subversion flag-o-matic kde-functions
-
-IUSE="X canna dict debug fep gtk kde m17n-lib nls"
-
-ESVN_REPO_URI="http://freedesktop.org:8080/svn/uim/trunk"
-ESVN_BOOTSTRAP="./autogen.sh -V"
-ESVN_PATCHES="*.diff"
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI=""
-
-LICENSE="||(GPL-2 BSD)"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	nls? ( sys-devel/gettext )"
-RDEPEND="!app-i18n/uim
-	X? ( virtual/x11 )
-	canna? ( app-i18n/canna )
-	gtk? ( >=x11-libs/gtk+-2 )
-	kde? (
-		=x11-libs/qt-3*
-		|| ( kde-base/kdebase-meta =kde-base/kdebase-3* )
-		=kde-base/kdelibs-3*
-	)
-	m17n-lib? ( dev-libs/m17n-lib )"
-
-src_compile() {
-
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-	use debug && append-flags -g
-
-	econf \
-		`use_enable fep` \
-		`use_enable dict` \
-		`use_enable nls` \
-		`use_with X x` \
-		`use_with canna` \
-		`use_with gtk gtk2` \
-		`use_with m17n-lib m17nlib` \
-		|| die
-	emake || die
-
-	if use X && use kde; then
-		set-qtdir 3
-		set-kdedir 3
-
-		local abs_top_dir=`pwd`
-
-		! use gtk && sed -ie "52s:NULL:\"uim-helper-candwin-qt\":" xim/canddisp.cpp
-
-		cd qt/uim-kdehelper
-
-		WANT_AUTOCONF=2.5 ./bootstrap
-		econf \
-			`use_enable nls` \
-			`use_enable debug '' full` \
-			--with-extra-includes=${abs_top_dir} \
-			|| die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	if use X && use kde; then
-		cd qt/uim-kdehelper
-		make DESTDIR=${D} install || die
-		cd -
-	fi
-
-	dodoc [A-Z][A-Z]* ChangeLog* doc/[A-Z0-9][A-Z0-9]*
-
-	if use fep; then
-		docinto fep
-		dodoc fep/[A-Z][A-Z]*
-	fi
-
-}
-
-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."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	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-svn/uim-svn-20050505.ebuild b/app-i18n/uim-svn/uim-svn-20050505.ebuild
new file mode 100644
index 000000000000..1e73774ffa1b
--- /dev/null
+++ b/app-i18n/uim-svn/uim-svn-20050505.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20050505.ebuild,v 1.1 2005/05/05 15:00:02 hattya Exp $
+
+inherit flag-o-matic kde-functions multilib subversion
+
+IUSE="X canna dict eb fep gtk immqt qt m17n-lib nls"
+
+ESVN_REPO_URI="svn://svn.utyuuzin.net/uim/trunk"
+ESVN_BOOTSTRAP="./autogen.sh -V"
+ESVN_PATCHES="*.diff"
+
+DESCRIPTION="a simple, secure and flexible input method library"
+HOMEPAGE="http://uim.freedesktop.org/"
+SRC_URI="http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD )"
+KEYWORDS="~x86"
+SLOT="0"
+
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	nls? ( sys-devel/gettext )"
+RDEPEND="!app-i18n/uim
+	!app-i18n/uim-fep
+	!app-i18n/uim-kdehelper
+	!app-i18n/uim-qt
+	X? ( virtual/x11 )
+	canna? ( app-i18n/canna )
+	eb? ( dev-libs/eb )
+	gtk? ( >=x11-libs/gtk+-2 )
+	immqt? ( >=x11-libs/qt-3.3.3-r1 )
+	qt? ( >=x11-libs/qt-3.3.3-r1 )
+	m17n-lib? ( dev-libs/m17n-lib )"
+
+pkg_setup() {
+
+	local co_dir="${ESVN_STORE_DIR}/uim/trunk"
+
+	[[ ! -e ${co_dir} ]] || [[ -e ${co_dir}.freedesktop.org ]] && return
+
+	local repo_uri repo loc
+
+	cd ${co_dir}
+
+	repo_uri=$(LANG=C svn info | grep "^URL" | cut -d" " -f2)
+
+	if [[ "$repo_uri" = "http://freedesktop.org:8080/svn/uim/trunk" ]]; then
+		einfo "freedesktop.org had stopped the anonymous svn access."
+		einfo "switch to the mirror svn repository."
+
+		cd ..
+
+		repo=$(basename ${co_dir})
+		loc=$(echo ${repo_uri} | sed -e "s:^.*//\([^:/]*\).*:\1:")
+
+		mv ${repo} ${repo}.${loc}
+		einfo "    move ${repo} -> ${repo}.${loc}"
+
+	fi
+
+}
+
+src_compile() {
+
+	if use qt || use immqt; then
+		set-qtdir 3
+	fi
+
+	econf \
+		`use_enable fep` \
+		`use_enable dict` \
+		`use_enable nls` \
+		`use_with X x` \
+		`use_with canna` \
+		`use_with eb` \
+		`use_with immqt qt-immodule` \
+		`use_with qt` \
+		`use_with gtk gtk2` \
+		`use_with m17n-lib m17nlib` \
+		|| die
+	emake || die
+
+	cd ${WORKDIR}/prime-1.0.0.1
+	econf || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	cd ${WORKDIR}/prime-1.0.0.1
+	make DESTDIR="${D}" install-uim || die
+	cd -
+
+	rm doc/Makefile*
+
+	dodoc AUTHORS COPYING ChangeLog* INSTALL* NEWS README*
+	dodoc doc/*
+
+	if use fep; then
+		cd fep
+		docinto fep
+		dodoc COPYING INSTALL README*
+		cd -
+	fi
+
+}
+
+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."
+	einfo "To use uim-prime you should emerge app-i18n/prime."
+	einfo
+
+	local chost
+
+	has_multilib_profile && chost=${CHOST}
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/${chost}/gtk.immodules
+
+}
+
+pkg_postrm() {
+
+	local chost
+
+	has_multilib_profile && chost=${CHOST}
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/${chost}/gtk.immodules
+
+}
+
+# $Id: uim-svn-20050505.ebuild,v 1.1 2005/05/05 15:00:02 hattya Exp $