Added app-i18n/skk-jisyo-200705 to DEPEND.

Package-Manager: portage-2.1.2.11

4 files changed, 40 insertions, 19 deletions

diff --git a/app-i18n/multiskkserv/ChangeLog b/app-i18n/multiskkserv/ChangeLog
index 1fee9d2a9a68..b9dce752e7d6 100644
--- a/app-i18n/multiskkserv/ChangeLog
+++ b/app-i18n/multiskkserv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/multiskkserv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.10 2007/04/23 14:10:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.11 2007/08/16 16:12:55 matsuu Exp $
+
+  16 Aug 2007; MATSUU Takuto <matsuu@gentoo.org>
+  multiskkserv-20020201.ebuild, multiskkserv-20051220.ebuild:
+  Added app-i18n/skk-jisyo-200705 to DEPEND.
 
 *multiskkserv-20051220 (23 Apr 2007)
 
diff --git a/app-i18n/multiskkserv/Manifest b/app-i18n/multiskkserv/Manifest
index 4d467439ca3e..0cd7f3019e37 100644
--- a/app-i18n/multiskkserv/Manifest
+++ b/app-i18n/multiskkserv/Manifest
@@ -17,18 +17,18 @@ SHA256 9ba5d64401a56e753030a7dbd8fc8aaa0962ef06dc4b6311b86af992bb6689ba files/mu
 DIST cdb-0.75.tar.gz 54162 RMD160 d52288ee6df58fdc5a79efc16693cd5e305f9c65 SHA1 555749be5b2617e29e44b5326a2536813d62c248 SHA256 1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5
 DIST multiskkserv-20020201.tar.bz2 159412 RMD160 f8f6228f93ba828f633055a84789953e5712bba6 SHA1 bcdd61f174095833edd54b2f844e3332e2bf10b3 SHA256 3bec276a3cd1831b9075eb61510f10b84c4605448bac4af7fa4d8b3af0612347
 DIST multiskkserv-20051220.tar.bz2 244023 RMD160 18dae8dcd6e26246a3243c143be46b533921464b SHA1 f7da523c2a998f7bf260799d369a3c8728a9b49d SHA256 c77ec5ec597cc6ff8f40fb63dcf4c470f61d2530a87846d8e4d6466eb5a490ec
-EBUILD multiskkserv-20020201.ebuild 1649 RMD160 fbea4c55945d927c709fbff7544e2d3d16854299 SHA1 d19c96e60ac29c64a7754843f67547d7e65517dc SHA256 8e7cdb91b27028717edc83fad11a0ca33d530216cbaae62cfb65d3ffed631c0a
-MD5 a4be859cc6e6084a01fbfb56b7fbe80f multiskkserv-20020201.ebuild 1649
-RMD160 fbea4c55945d927c709fbff7544e2d3d16854299 multiskkserv-20020201.ebuild 1649
-SHA256 8e7cdb91b27028717edc83fad11a0ca33d530216cbaae62cfb65d3ffed631c0a multiskkserv-20020201.ebuild 1649
-EBUILD multiskkserv-20051220.ebuild 1106 RMD160 6e77b3f841c245bcdedb7a0e744a70be064573a1 SHA1 ee4f5c07abeef58bcf3c195454623b1f0f478790 SHA256 99cc998cab154aa1e42f3fd4b145c7fb669e44ad962a1ff9cce4cd933dda8ef8
-MD5 c2247a650d5d3b0ec54242e1956ff933 multiskkserv-20051220.ebuild 1106
-RMD160 6e77b3f841c245bcdedb7a0e744a70be064573a1 multiskkserv-20051220.ebuild 1106
-SHA256 99cc998cab154aa1e42f3fd4b145c7fb669e44ad962a1ff9cce4cd933dda8ef8 multiskkserv-20051220.ebuild 1106
-MISC ChangeLog 1495 RMD160 09edda85a9448f3b4fe2e68dfafdffd195c4c8ef SHA1 9af177371c9954dd53ad00fb33e75efe85bb84dc SHA256 425a2e28f7acc0c755264d1dd047178dd56b3e33fe81b7c1db88e33e9134c9f2
-MD5 8ffff15e83504abcd20f31c70bb30960 ChangeLog 1495
-RMD160 09edda85a9448f3b4fe2e68dfafdffd195c4c8ef ChangeLog 1495
-SHA256 425a2e28f7acc0c755264d1dd047178dd56b3e33fe81b7c1db88e33e9134c9f2 ChangeLog 1495
+EBUILD multiskkserv-20020201.ebuild 1874 RMD160 dae5697f3e490e7a9df8e66f37c36126d6b3bb80 SHA1 6a013bc8fa7f1991d326a8eac82da2d40699d96c SHA256 4818e5b60d89fcaa791f14c8a9911f4880dadf438f982dde06e3121856957e11
+MD5 a36eca6db4db952c930caeb16ff1fa05 multiskkserv-20020201.ebuild 1874
+RMD160 dae5697f3e490e7a9df8e66f37c36126d6b3bb80 multiskkserv-20020201.ebuild 1874
+SHA256 4818e5b60d89fcaa791f14c8a9911f4880dadf438f982dde06e3121856957e11 multiskkserv-20020201.ebuild 1874
+EBUILD multiskkserv-20051220.ebuild 1458 RMD160 0a0f60774eb07cca09f79ff75cc2931b31fa6371 SHA1 2de884abf72a58c32a4eb4ac17c20f175fb6ed1c SHA256 d5c016f3755225cc31ce194a8f3a990f8666c4d6c5678d5740a70abfbd4a903c
+MD5 3cb9de835c7e2dc49fe61eae26c1f806 multiskkserv-20051220.ebuild 1458
+RMD160 0a0f60774eb07cca09f79ff75cc2931b31fa6371 multiskkserv-20051220.ebuild 1458
+SHA256 d5c016f3755225cc31ce194a8f3a990f8666c4d6c5678d5740a70abfbd4a903c multiskkserv-20051220.ebuild 1458
+MISC ChangeLog 1652 RMD160 a4f9eeb3bef3b35420ecb93a51db260f167adf52 SHA1 45a025697fe1db8f6e875b3ab4d9b2bac8e348c3 SHA256 a74ea09acb069418fb2aa899a975df9bed45c7c014ab8c5af77c68f91c9c9d63
+MD5 1384bf99ac5a23b7b00f816d2d7ce822 ChangeLog 1652
+RMD160 a4f9eeb3bef3b35420ecb93a51db260f167adf52 ChangeLog 1652
+SHA256 a74ea09acb069418fb2aa899a975df9bed45c7c014ab8c5af77c68f91c9c9d63 ChangeLog 1652
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
diff --git a/app-i18n/multiskkserv/multiskkserv-20020201.ebuild b/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
index 8162ae4781fe..3e1d163b6dc8 100644
--- a/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20020201.ebuild,v 1.12 2007/04/23 14:10:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20020201.ebuild,v 1.13 2007/08/16 16:12:55 matsuu Exp $
 
 inherit eutils fixheadtails
 
@@ -19,12 +19,18 @@ KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 
 DEPEND="virtual/libc
-	app-i18n/skk-jisyo-cdb"
+	|| (
+		>=app-i18n/skk-jisyo-200705
+		app-i18n/skk-jisyo-cdb
+	)"
 PROVIDE="virtual/skkserv"
 
 pkg_setup() {
-	elog "If you want to add some extra SKK dictionaries,"
-	elog "please emerge app-i18n/skk-jisyo-extra first."
+	if has_version '>=app-i18n/skk-jisyo-200705' && ! built_with_use '>=app-i18n/skk-jisyo-200705' cdb ; then
+		eerror "multiskkserv requires skk-jisyo to be built with cdb support. Please add"
+		eerror "'cdb' to your USE flags, and re-emerge app-i18n/skk-jisyo."
+		die "Missing cdb USE flag."
+	fi
 }
 
 src_unpack() {
diff --git a/app-i18n/multiskkserv/multiskkserv-20051220.ebuild b/app-i18n/multiskkserv/multiskkserv-20051220.ebuild
index b8f255dc4c38..a6b19dea45ff 100644
--- a/app-i18n/multiskkserv/multiskkserv-20051220.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20051220.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20051220.ebuild,v 1.1 2007/04/23 14:10:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20051220.ebuild,v 1.2 2007/08/16 16:12:55 matsuu Exp $
 
 inherit eutils fixheadtails
 
@@ -14,10 +14,21 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-db/cdb"
-RDEPEND="app-i18n/skk-jisyo-cdb"
+RDEPEND="|| (
+		>=app-i18n/skk-jisyo-200705
+		app-i18n/skk-jisyo-cdb
+	)"
 
 PROVIDE="virtual/skkserv"
 
+pkg_setup() {
+	if has_version '>=app-i18n/skk-jisyo-200705' && ! built_with_use '>=app-i18n/skk-jisyo-200705' cdb ; then
+		eerror "multiskkserv requires skk-jisyo to be built with cdb support. Please add"
+		eerror "'cdb' to your USE flags, and re-emerge app-i18n/skk-jisyo."
+		die "Missing cdb USE flag."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}