Prevent uim from creating /share/uim when you do not have app-i18n/prime; bug #99824.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 29 insertions, 16 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index abbd0caab95c..84915e503f2f 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.103 2005/07/21 14:30:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.104 2005/07/22 12:08:38 usata Exp $
+
+  22 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> uim-0.4.6-r2.ebuild,
+  uim-0.4.7.ebuild:
+  Prevent uim from creating /share/uim when you do not have app-i18n/prime;
+  bug #99824.
 
 *uim-0.4.7.1-r1 (21 Jul 2005)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index d2ad6b607b56..ca889fb5d9aa 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,8 +1,8 @@
+MD5 509cb60cc0bf1a3d81c8802e46850e63 uim-0.4.7.ebuild 3371
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 fef855d148f568ee7029c3f528c3bbd9 ChangeLog 15262
+MD5 e9cdb8a0cb19af94d4d96527dd6ff935 ChangeLog 15443
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 71a16d6b28195ef79aa6f20c4db2b167 uim-0.4.7.ebuild 3269
-MD5 fec0178ca1c0f35d6cfca7c36d90227f uim-0.4.6-r2.ebuild 3537
+MD5 d42280271b897d4f0cbcb86bc3bc748d uim-0.4.6-r2.ebuild 3642
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
 MD5 221e33deb3e1e1959d0db0c86f6f98bc uim-0.4.7.1.ebuild 3070
 MD5 b0ac027285e862cdd202d9c262da8115 uim-0.4.7.1-r1.ebuild 3146
diff --git a/app-i18n/uim/uim-0.4.6-r2.ebuild b/app-i18n/uim/uim-0.4.6-r2.ebuild
index 2ccea0cc68bc..6e58b73b2035 100644
--- a/app-i18n/uim/uim-0.4.6-r2.ebuild
+++ b/app-i18n/uim/uim-0.4.6-r2.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-r2.ebuild,v 1.7 2005/07/18 10:30:16 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6-r2.ebuild,v 1.8 2005/07/22 12:08:38 usata Exp $
 
 inherit eutils kde-functions
 
@@ -80,16 +80,20 @@ src_compile() {
 	econf ${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	econf || die
+	if has_version '>=app-i18n/prime-1.0' ; then
+		cd ${WORKDIR}/prime-1.0.0.1
+		econf || die
+	fi
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	make DESTDIR="${D}" install-uim || die "make install-uim failed"
-	cd -
+	if has_version '>=app-i18n/prime-1.0' ; then
+		cd ${WORKDIR}/prime-1.0.0.1
+		make DESTDIR="${D}" install-uim || die "make install-uim failed"
+		cd -
+	fi
 
 	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
diff --git a/app-i18n/uim/uim-0.4.7.ebuild b/app-i18n/uim/uim-0.4.7.ebuild
index 379544723190..7ad5f95a16a2 100644
--- a/app-i18n/uim/uim-0.4.7.ebuild
+++ b/app-i18n/uim/uim-0.4.7.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.7.ebuild,v 1.3 2005/07/18 14:50:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.ebuild,v 1.4 2005/07/22 12:08:38 usata Exp $
 
 inherit eutils kde-functions
 
@@ -77,16 +77,20 @@ src_compile() {
 	econf ${myconf} --without-scim || die "econf failed"
 	emake -j1 || die "emake failed"
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	econf || die
+	if has_version '>=app-i18n/prime-1.0' ; then
+		cd ${WORKDIR}/prime-1.0.0.1
+		econf || die
+	fi
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	make DESTDIR="${D}" install-uim || die "make install-uim failed"
-	cd -
+	if has_version '>=app-i18n/prime-1.0' ; then
+		cd ${WORKDIR}/prime-1.0.0.1
+		make DESTDIR="${D}" install-uim || die "make install-uim failed"
+		cd -
+	fi
 
 	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}