Add USE=gtk3 and add configure option to specify gtk version. #434740

Package-Manager: portage-2.1.11.16/cvs/Linux x86_64

4 files changed, 22 insertions, 27 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 2f8ac90dab59..e7d9cec927fd 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/scim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.159 2012/08/19 03:15:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.160 2012/09/15 12:41:47 naota Exp $
+
+  15 Sep 2012;  <naota@gentoo.org> metadata.xml, scim-1.4.14.ebuild:
+  Add USE=gtk3 and add configure option to specify gtk version. #434740
 
   19 Aug 2012; Naohiro Aota <naota@gentoo.org> scim-1.4.14.ebuild:
   Fix build failure with USE=doc
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 3bc6877b2642..c24bc424c961 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX scim-1.4.11-type-module-use.patch 413 SHA256 997623d2a467ad87d49eab3dec1cd766718e2431da52d71e474c9ff74cb938c1 SHA512 f26d5429b273c172d764e7b3b380b2d489d07e66cc8b850522dc2cd47b2e1b86e2dfc710b65baf39af4e0302b0ca7e146d924a656c4d632e90f808f8f8db8ace WHIRLPOOL 2b404e7a869a490c7bbb39574c80c56d838619ff943b85b870483bd6dc10426230047ec676fc6659e0b62a660265f0e68c6d076bfd4259a4632753bb3578d65a
 AUX scim-1.4.7-syslibltdl.patch 1676 SHA256 ee807b34d95df48af40abc1a4d285d7929548481be44aba1bab407e22f406d88 SHA512 db27e596ccb78023fad3edaeccff26e120fa5b52f2da4691eeea6ebe9ed21c37f27432b18156e84580066f81d06fba9f6414597f75b8ebda21639e1a3023355e WHIRLPOOL 3a6b429241a2b5d7e9b57b95f50afcba5d365d7c7d0f44963bfa1c368d9b1d786506fd2b3d7b58bbbda0a57cb6326ec3e55e88e4bd644af03fa9e28b19621e11
 AUX scim-fix-disappeared-status-icon.patch 1458 SHA256 f6ce00bfe8046c21b1509146d9d90ae919ed577c25fbaa9d9bff68cd776a064e SHA512 e9427e25589cafb77ee7d6ca48a3979cae34cd91bd1f9cb207b19c7708c229e628d84fe06e9dacf4f9340a8bb2aec2b65df3216ba47e8933075c4d680925c783 WHIRLPOOL 3e6fa3e99f7d92374c555483262c27682ec384abee11abc2ff59397eb0cf06df5a84b8c79be994f3f29b01435f981bcb251eeb606ff3105767de887459247b40
@@ -10,25 +7,8 @@ DIST scim-1.4.14.tar.gz 1519287 SHA256 e91e4cfed92f3e19d229f702eda03038b3f9a0ce6
 DIST scim-1.4.9.tar.gz 2928091 SHA256 f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0 SHA512 5b8239e4274dbb896d48d4411012d755ee903f885092edd9943168e535fb78b23c7bc832f22bde1fe6ff715a55a5e2779baea9f1ac9e68257576301541906761 WHIRLPOOL b51b14205985d826ba9d7341a85546c0d1ac2290b99e6814d0f5ff064d6fa24dc07fc5fc2405eb465b45ab7255e969acca914b7989f7cde5b7c50e25cb28a288
 EBUILD scim-1.4.11-r1.ebuild 2561 SHA256 6958027f3a307b62dd2b6ba9f401669c9a48b6ab5bb8e12347b45cf0f39f066c SHA512 047103b8c06becf0c31e60711c6c69c79d10e766ee0d7bc09049cc39c2921ae282f2b6724b9d071a9abf84113b51946883e4ddc19fcb7d238dfb02a6d83f2e02 WHIRLPOOL e2d887a3c536977f5fddb29068d03619658405e6db17bcb732f91a2d5fdea8a968af75c144569ae82d00c4b4806650b9604aa7357ebadd8d92655fb047ae1211
 EBUILD scim-1.4.11.ebuild 2873 SHA256 9c2542b733f40b4cbb2032de312ca02e4b6014331cb568a74832a1140758cb00 SHA512 7fc8d9a4078edf684f5dab2a726f006259d0e7129ff14ed4eabbb310e70f467d1be10a42daa63f80c0e043a8cf01ef39255be673e56634a65a6abb4d311ff3fc WHIRLPOOL 39f2921a2045534ad146daec643ee6925100daba4785748f9230bee65292eb5a746836823691119353ab0eae0f7bae0063a567a4d4d55a311185068e5f51fafa
-EBUILD scim-1.4.14.ebuild 2613 SHA256 41cbb4e34e25447fba9d6fccbcdcfa6f1ff4f19f3c3fa4f187fa65b01dfbe82d SHA512 13c89b4738705addba2e1ec9dc68a7ab39c7f8c28c4c9733e0e063e90f178f5eb3007c1424bc863ce83ae3da5f7ea1e8c35239f8f6f2551d482d1b29570b9cc2 WHIRLPOOL bae401652a64f998c9655e52ccc5f538f8f8353738e3b03b81769ea25a4d835067cf1a8750a702de952b31e9f94d4f6d4df9275fac6715b61b33bbb5fd90c321
+EBUILD scim-1.4.14.ebuild 2794 SHA256 3b7ae19f40c036b3cf0f680206d4d7d71496fd2a876a2e149c8f9ed9ea7d167b SHA512 e34a50e24425f05756e76bb7ff0bbb4a6ae7855be0d6a6c01c338784e02257d1276610484b142e97a4018927cc435225f85a67da19575218272edc8644dd8110 WHIRLPOOL 9c2a3bffcc273e7cfc8001f43191c45165f1dbe2fe6fdb1899c2981bf13a2a9f81abda2c68a6fce4508614646a9fcdfe60af736f9d34098495bbf396f93949b4
 EBUILD scim-1.4.9-r1.ebuild 3131 SHA256 2934cd6f8702c915732c97858ee916eb30bb16f343b8f0e2676ea2c59e17004e SHA512 f4922801b11da5f49c090347957064b49643916d04a408c9d316b0949632f28613ceb90dd294bb0dd67945cd5b119babeb173d6e86a3f9ca813bbddc4af1aedc WHIRLPOOL fbfbeb4485713d94a0e2134f32020e364de4ad567fbd06d2d24dcb5cecd9362c44d94a415049e498470bfd1e3271fbf68767a2582603a95c16277659e6f6709e
 EBUILD scim-1.4.9-r2.ebuild 3141 SHA256 9260342ea5648c97f02f16ff1e326ec687d44b3f2b79102609a0f53cc8f008ff SHA512 78e4d6dec15d9905e3973d3136e659990a4553c90d0dfa39525ec9071a99d11b09948372a315fcb5a5401052434211ae2363d4d2c810cb11c484d12f6947230c WHIRLPOOL 265ee51805b09546e781e7dfb9684bd4495fb5275658145f5e951a2bcc8d803db32935f44bd8ec4f732c36de14d30382ffd507a0857b4050771044765c115f75
-MISC ChangeLog 21549 SHA256 9a94a1dd6f81987acf5b8c733f7dcd48ba7560112effcde77c47868e6be2f3cc SHA512 6c1038f4102d808f2a44a1a2c7f8db428ace12b2a1b7d0c7f38d55b41299d8bdbd8188e11a5e3e04bacf936857d2f3879c7ff1836dcd5ff515dc14e78215398f WHIRLPOOL b2f9dd30ba78ad39403bb6c8628b94f7fd617426a8d1f7141ee8b8179dc4e620ad0d4ac66e74a5c7d7d9604ee738661faf52ca68d4b9646a09145c828c1b04dc
-MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQMFpBAAoJEDYO1FT4VRUUN5UQAJwdiz/1+W5pYYoVT86ZhGkr
-w8OeNDgI7Y56CY32ZhDnGjY50Sympy8tQbYl58t7culNWGEP6/NPKGxaEntNkSKM
-+9iV3qW1+RkOgfpJxE6lR0xE8Rv+DthJzrbpZdnvvOBovOlAn2UJMfhu5QxE1FBJ
-2TzityawkPg3C+ceTwe92zJyMYubRUsOpdKizCtITKfP7RmMTkze3OFKiH0tdMgz
-LrxKi7+jkZijnn8RxHdF6pg0aeXm5YuOY8IccDXh9Dn5GXknviRHvNFt9NF92Uux
-smlJYPcyG6iEB1qzjgomF2Wv7jFteLKlWzLfpBqN7GRVkFydxWeB0z43rHAOOBSU
-6WnIxXeMRmtkze9NDHxsRhOXZ/6YO0zxO0fBBPLSZtdNaVIKi/KnWvKA2Aq+28tu
-1I3luYeAwpMUmReaqWj0pPO3VYPBphaP/x1IzwQXJmOGYz/rk/cfutSVEdRpMlRU
-+R0iWARcgm88n+Kjm4AJWQxF+8FN+GiD/vQuapSHihVcb7s5NzkW3q6N8Mvqctyx
-3y46E5p8AKQsIG7yJO63P09bRf/9YZoGsWcNXZH3D5/Y1/UDAqkcgLKRCOIIbbDv
-VHgGHgzYYmoTfoPCH3NyhpMUwEoZg+azCRTBy8qJuedetA88y+JGXJ9QVeq5aGij
-Q/jHGNq21isc0TsRyyIc
-=L7Qa
------END PGP SIGNATURE-----
+MISC ChangeLog 21691 SHA256 3e2857aaeba98e4cf7b8b989ed3f602b26123a58aaa5c3160d5b5e20acd2e769 SHA512 2d60c1b39605e6e132f3d9cbfc99156659a0b4a6bf20c0ae7144a741293a758d954de300c5f0cde9621d7dc0b432e8e5decfe466a7f3ee7bb37290eb1b9b43b8 WHIRLPOOL aa6628013b26ed926ed28f0ad6d9b25f6725bd288b5d910ccc198c952e272cda08babe0bd96b7c0790c17e0baed6105a66686b4e19b414303537181e11bf9105
+MISC metadata.xml 242 SHA256 a1b83378c4c332a89ee129c34749a0640792dddea884a5167e430de948a29631 SHA512 8d2da52c7d8cee21552fc92af5e6e0d12af2f172d692f733a6e0314e0ebd312e25f08dedeea8ae71a93c20ad4189b0f9c2451e95691df5bda9d8663b852f7191 WHIRLPOOL 51d8a345541815e7c0b62f2e47d318d3957553f2392413e37d9bac77b1c7c9771f4a2b51f5147054901f8815b0ce722408171c60dfe54a49d1742cd7d926421a
diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml
index 2d5852c16c60..2e3d5763f483 100644
--- a/app-i18n/scim/metadata.xml
+++ b/app-i18n/scim/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
+<use>
+  <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+</use>
 </pkgmetadata>
diff --git a/app-i18n/scim/scim-1.4.14.ebuild b/app-i18n/scim/scim-1.4.14.ebuild
index 75c4f01a4d12..e624ef3eb6ed 100644
--- a/app-i18n/scim/scim-1.4.14.ebuild
+++ b/app-i18n/scim/scim-1.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.14.ebuild,v 1.2 2012/08/19 03:15:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.14.ebuild,v 1.3 2012/09/15 12:41:47 naota Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic multilib gnome2-utils autotools-utils
@@ -12,11 +12,12 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
+IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
 	dev-libs/glib:2
-	x11-libs/gtk+:2
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
 	!app-i18n/scim-cvs"
@@ -37,11 +38,19 @@ DOCS=(
 )
 
 src_configure() {
+	local gtk_version
+	if use gtk3; then
+		gtk_version="--with-gtk-version=3"
+	else
+		gtk_version="--with-gtk-version=2"
+	fi
+
 	# bug #83625
 	filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
 	local myeconfargs=(
 		$(use_with doc doxygen)
 		--enable-ld-version-script
+		$gtk_version
 	)
 	autotools-utils_src_configure
 }