Force scim not to use gtk3.

Package-Manager: portage-2.2.0_alpha127/cvs/Linux x86_64

4 files changed, 25 insertions, 20 deletions

diff --git a/app-i18n/scim-anthy/ChangeLog b/app-i18n/scim-anthy/ChangeLog
index 0e4cc11bdd7b..bc6d03992420 100644
--- a/app-i18n/scim-anthy/ChangeLog
+++ b/app-i18n/scim-anthy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-anthy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/ChangeLog,v 1.62 2012/05/03 19:24:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/ChangeLog,v 1.63 2012/09/26 03:23:09 naota Exp $
+
+  26 Sep 2012;  <naota@gentoo.org> scim-anthy-1.2.6.ebuild,
+  scim-anthy-1.2.7.ebuild, scim-anthy-1.3.1.ebuild:
+  Force scim not to use gtk3.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> scim-anthy-1.2.6.ebuild,
   scim-anthy-1.2.7.ebuild, scim-anthy-1.3.1.ebuild:
@@ -276,4 +280,3 @@
   30 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
   +scim-anthy-0.2.0.ebuild:
   Initial import.
-
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
index 4c7bed5b8cea..7807787cf352 100644
--- a/app-i18n/scim-anthy/Manifest
+++ b/app-i18n/scim-anthy/Manifest
@@ -2,7 +2,7 @@ DIST scim-anthy-1.2.6.tar.gz 667839 SHA256 23f00655d2ed18c51ef21693a36b48c4a2b07
 DIST scim-anthy-1.2.7.tar.gz 680942 SHA256 cb60070d8f6ff281a99d329c9d731f02ae16893083c9efa9970ccd7287365198 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da WHIRLPOOL 1268e71f435ab222da38a4028334a8c83795fe584634d0416956e0295b389f4232e822feaf90416ac88b79e73541f3c7607da3a33222f8644c2151b984a45c7a
 DIST scim-anthy-1.3.1.tar.gz 775479 SHA256 a1fe2f5bef0107ea2c04c69c28b1660156edd667ba8c15bf72ab703220977e80 SHA512 c72cbb6a008bc28fb31fa1ab0c1707bd738a0ab724bf5a284a5b7f71432361729486457fa46addf7cb213faa3c4a6c371b0ea3be6bc6930a2541c1df148e995a WHIRLPOOL 5d1fcabab5483d8d16aac2660e01bd81d4e76943915c647425dc962b92b360e42e61e327fc0ff54c29bfcdeb2dd5d58a002e6c11b817d6df1f572e8f9bdf2645
 EBUILD scim-anthy-1.2.6.ebuild 1389 SHA256 120edc5d1813960500b5b961839dac75da15684cf67d7fdc5e27ba3980d13947 SHA512 ddbf2915db4585901df42d9f671a0af563376d8b797a6989c46c2432d3b5409f73f744000064df94962c3150a69609099d2f0f38efcdc9e2de39b16830036ec7 WHIRLPOOL 8ec4f56ae3303996d1426133165705a14eeeb46ab0c9159276ba69afc92f5ec415f914bd8e4a16d9264406f2c794499aaae678436abdd9a46f6f268d62a0e582
-EBUILD scim-anthy-1.2.7.ebuild 1360 SHA256 9108ca0ec09b48f3dae176c19f4f3b8dbe4bc6c91c5184f2159e4f9cf56bc001 SHA512 1dcbfe1088960d044f73f9328ca8dcd2c41b6e0c552c108a9c1d4213915e379504574439278369910b12d7d8dab3e922e541445ae15fa0d73485ef7e3035ed85 WHIRLPOOL 040f8ceca92a1b2477123704b5a0c437b48a15218da67ecda569de8282c96f97f9ff07ad5c1c310e0825bc8445d6009eabcc7758ab9e4c5171e0733dcc58331e
-EBUILD scim-anthy-1.3.1.ebuild 1392 SHA256 f424db392c1dd940dc573e3590696805170a1a28d63c1d298915e1816f029a4c SHA512 7c36ad9438bb27e5656dc0706998100a4019fb81bdd83eb580fe10b70dd6701a48c7152c7870ad802130303c2c380137c4b8690f257f23d99371694465ba22a6 WHIRLPOOL 0b2fc508ddabc308e71435095ba3c8ee05516de68c708bc923ce0b25a6f3d7b5ad1af037cada8af240c9db69c55d77611216f460230963bdbbe87797149546df
-MISC ChangeLog 8499 SHA256 f83b25758f07d8acc21e5ff16aead44cfaa5280491db649b0d8f328025fc6b8a SHA512 a9b39ed2e775770fca4163cd406ad819f40aafe4d76b8805c5ac925aabff81f18076ac656d67405917ebac11b2ce0474128b104c03f92ee7d352d49b29104d23 WHIRLPOOL e849cfb986252e0c354d495a4f4cee790f4440eef464926a8d873df2389921c405e40a39398f276501eadf0c11367b0d9daa2658d8b982d43f5dfd0c1406127b
+EBUILD scim-anthy-1.2.7.ebuild 1364 SHA256 384a89b71fc5d309efc4a55181a43a900f5963073a6ad1e978a7f8c2e3ce4620 SHA512 e5b892521a7d1f5611b3ceb07f34d53919d7d160e0aa336aa09437cbc353082d746419c462fb69f42d803a55bb5cee81a6c46305690cafa655d49ace61114625 WHIRLPOOL 8353067ad874cc1a7308ea57eddfa0ad8906e41cf25d9bb191786606d58ee655e3603aad36af833690e7eef455d1f3a4a86f59f1a2fb1d539c02e3f926366063
+EBUILD scim-anthy-1.3.1.ebuild 1403 SHA256 87894f0e74a20a48f6623ad95caf7eb6408690eaa12e0ab015dd1f80b54ddba8 SHA512 25f555e3a438ae560fee984ca99ba31036ec01f514c28ac6b48e031a81da41622b2740963bfd40e7ad4d97b1f8448282f0f703b8d1dc49b63fb556b1c1da4433 WHIRLPOOL 35a13d05b6ed20d73d6d416d2f1960499d34414cf69d0b5c68e849d4b12e7c5efa6d69da865171f5ecc698504cc60dcaf121d4738f9ad8ff89a7a8a1c2513dcc
+MISC ChangeLog 8640 SHA256 01a9689c280a249462ba6f83cb76a4fb6b98b41d88c6409acf2946c7ff48346c SHA512 2a21db26e291d618b1a55c7eca4eb226be7267b5278e2047cf1078561303cca6b6c4a1454a1ddc8550d4a740992c119e639ebd7e79bdb95ae1160ef5d9067aaf WHIRLPOOL cac03a3bc8484e2e2f3d67de0dba6a36afc36ca01e2d07707fba424723f47b380c75ab5bc8ed5ebdb70abbc5a670689a6ea6f61be3c41a98d75fb95a024026ce
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7.ebuild
index 44bcd1038367..6b627769c94f 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/scim-anthy-1.2.7.ebuild,v 1.4 2012/05/03 19:24:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/scim-anthy-1.2.7.ebuild,v 1.5 2012/09/26 03:23:09 naota Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit libtool
 
@@ -25,17 +25,18 @@ DEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		--disable-static \
-		--disable-dependency-tracking
+		--disable-dependency-tracking || die
+}
+
+src_compile() {
 	emake || die "emake failed"
 }
 
diff --git a/app-i18n/scim-anthy/scim-anthy-1.3.1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.3.1.ebuild
index b1869ced9603..e02c0b1d14dc 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.3.1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/scim-anthy-1.3.1.ebuild,v 1.5 2012/05/03 19:24:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-anthy/scim-anthy-1.3.1.ebuild,v 1.6 2012/09/26 03:23:09 naota Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit libtool
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="gtk nls"
 
-DEPEND=">=app-i18n/scim-1.2
+DEPEND=">=app-i18n/scim-1.2[-gtk3]
 	|| ( >=app-i18n/anthy-7500 >=app-i18n/anthy-ss-7500 )
 	nls? ( virtual/libintl )
 	gtk? ( >=x11-libs/gtk+-2.8:2 )"
@@ -25,17 +25,18 @@ DEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		--disable-static \
-		--disable-dependency-tracking
+		--disable-dependency-tracking || die
+}
+
+src_compile() {
 	emake || die "emake failed"
 }