Version bumped. This contains a security fix for uim-prime; see http://lists.freedesktop.org/archives/uim/2005-February/000996.html

Package-Manager: portage-2.0.51-r15

5 files changed, 18 insertions, 24 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 1148d3ed3a89..3987b444bbe1 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.81 2005/02/11 15:53:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.82 2005/02/20 14:04:26 usata Exp $
+
+*uim-0.4.5.1 (20 Feb 2005)
+
+  20 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> -uim-0.4.5-r1.ebuild,
+  +uim-0.4.5.1.ebuild:
+  Version bumped. This contains a security fix for uim-prime; see
+  http://lists.freedesktop.org/archives/uim/2005-February/000996.html
 
 *uim-0.4.6_alpha1 (12 Feb 2005)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index f59393d6a9bc..9a78d79483ab 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,10 +1,10 @@
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 a1185470e4f6d23576c54a23e6e7708a ChangeLog 12340
+MD5 ab6460c8c596c19084ed3a36c747cbf1 ChangeLog 12599
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 18acee6c4d7c6c7f8ef204bc9fc30f57 uim-0.4.1.ebuild 1785
-MD5 352ee3ea245c04721d96a79c5e5bc3a6 uim-0.4.5-r1.ebuild 2639
 MD5 13b00719e566723c9d684cac75c7439e uim-0.4.5.ebuild 2267
 MD5 6d242be81b4f8e51e63c5997d12f4523 uim-0.4.2.1.ebuild 1795
+MD5 0fc1074427094c2b21bd58fc88e83558 uim-0.4.5.1.ebuild 2264
 MD5 2fe33c163792c93e1024bc5f17ee381b uim-0.4.6_alpha1.ebuild 2672
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 bb951055d72fd152ee21f5f8cfc9140f files/digest-uim-0.4.1 61
@@ -12,5 +12,5 @@ MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
 MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
 MD5 00537e2c63ca679a4889917d52b74a60 files/digest-uim-0.4.2.1 63
 MD5 fc4ac83ce1c4a273be674bbcdb3dea5b files/digest-uim-0.4.5 62
-MD5 9a217f32ead72ea9956d7c5eb90ca610 files/digest-uim-0.4.5-r1 128
 MD5 9c0341999a72cda7ff17ef9e87383660 files/digest-uim-0.4.6_alpha1 68
+MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
diff --git a/app-i18n/uim/files/digest-uim-0.4.5-r1 b/app-i18n/uim/files/digest-uim-0.4.5-r1
deleted file mode 100644
index fa0c2817b1b6..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.5-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb512967e08c4b112ab38d185db89d3c uim-rev1650.tar.gz 1080498
-MD5 32c12ffb39f0d3473f19f896aece55ab prime_2004-12-13.scm 56852
diff --git a/app-i18n/uim/files/digest-uim-0.4.5.1 b/app-i18n/uim/files/digest-uim-0.4.5.1
new file mode 100644
index 000000000000..968119d8ac2d
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.5.1
@@ -0,0 +1 @@
+MD5 10d48b4a5db1f19b8cf9f5099265aa4c uim-0.4.5.1.tar.gz 1113356
diff --git a/app-i18n/uim/uim-0.4.5-r1.ebuild b/app-i18n/uim/uim-0.4.5.1.ebuild
index 723d70abf652..c0834eaec59b 100644
--- a/app-i18n/uim/uim-0.4.5-r1.ebuild
+++ b/app-i18n/uim/uim-0.4.5.1.ebuild
@@ -1,22 +1,19 @@
 # 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.5-r1.ebuild,v 1.4 2005/01/12 18:38:57 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.5.1.ebuild,v 1.1 2005/02/20 14:04:27 usata Exp $
 
 inherit eutils flag-o-matic
 
-MY_P="${PN}-rev1650"
-PRIME_SCM="prime_2004-12-13.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://freedesktop.org/Software/UimDownload/${MY_P}.tar.gz"
-SRC_URI="http://freedesktop.org/~tkng/${MY_P}.tar.gz
-	http://prime.sourceforge.jp/src/${PRIME_SCM}"
+SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~ppc64 ~sparc hppa"
+KEYWORDS="x86 ~alpha ~ppc ~amd64 ~ppc64 ~sparc"
 IUSE="gtk nls debug X m17n-lib"
 
 RDEPEND="X? ( virtual/x11 )
@@ -30,20 +27,11 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
 
-get_gtk_confdir() {
-	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
 	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-	cp ${DISTDIR}/${PRIME_SCM} scm/prime.scm || die
 }
 
 src_compile() {
@@ -85,9 +73,9 @@ pkg_postinst() {
 	ewarn "Available input methods can be found by running uim-im-switcher."
 	ewarn
 
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
 
 pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }